Skip to content

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Mar 4, 2022

Instead of including slightly more complicated logic in check_argument_types to fix the bug (#94516) I introduced in #94438, and inevitably have this bug appear once again when some other diagnostic is written that causes check_expr to be called an expression during a (bad) code path, just delay the bug in adjustment logic.

I am open to other implementations that don't delay the bug here.

Fixes #94516

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 4, 2022
@rust-highfive
Copy link
Contributor

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 4, 2022
@estebank estebank added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 4, 2022
@estebank
Copy link
Contributor

estebank commented Mar 4, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 4, 2022

📌 Commit 8af683d has been approved by estebank

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 4, 2022
@estebank
Copy link
Contributor

estebank commented Mar 4, 2022

Beta nominated as it addresses #94511.

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 5, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#94362 (Add well known values to `--check-cfg` implementation)
 - rust-lang#94577 (only disable SIMD for doctests in Miri (not for the stdlib build itself))
 - rust-lang#94595 (Fix invalid `unresolved imports` errors for a single-segment import)
 - rust-lang#94596 (Delay bug in expr adjustment when check_expr is called multiple times)
 - rust-lang#94618 (Don't round stack size up for created threads in Windows)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3064d6e into rust-lang:master Mar 5, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 5, 2022
@compiler-errors compiler-errors mentioned this pull request Mar 9, 2022
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 10, 2022
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 14, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.61.0, 1.60.0 Mar 14, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 14, 2022
…ulacrum

[beta] backports

* Update LLVM submodule rust-lang#94764
* Statically compile libstdc++ everywhere if asked rust-lang#94719
* Downgrade #[test] on macro call to warning rust-lang#94624
* Delay bug in expr adjustment when check_expr is called multiple times rust-lang#94596
* bootstrap: correct reading of flags for llvm rust-lang#94466
* Check method input expressions once rust-lang#94438
* remove feature gate in control_flow examples rust-lang#94283

r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2022
…k-Simulacrum

[beta] Remove statement that was forgotten when backporting rust-lang#94596

This `if` statement was introduced in rust-lang#94438, then removed in rust-lang#94596. Both of these PRs were beta-backported in rust-lang#94933, but I think there was a mistake in the order they were applied or this removal was overlooked. I think this fixes the remaining issues referenced in rust-lang#94511 (comment).

Not sure this is the correct way to put something up for beta-backport, but the PR is at least open so it can be referenced and the commit can be cherry-picked. Feel free to close this PR.

r? `@Mark-Simulacrum`
cc: rust-lang#94511
@compiler-errors compiler-errors deleted the delay-adjustment-duplicate branch April 7, 2022 04:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ICE: no type for local variable
7 participants